x86: Couple of small cleanups after cpuid faulting patch.

Signed-off-by: Keir Fraser <keir@xen.org>

diff --git a/xen/arch/x86/cpu/cpu.h b/xen/arch/x86/cpu/cpu.h
index e4b0044983a9917d0626ffdfac188a5649500d3c..a696859ff6ca0f50a040e3910117b7654df552ee 100644 (file)
--- a/xen/arch/x86/cpu/cpu.h
+++ b/xen/arch/x86/cpu/cpu.h
@@ -30,4 +30,3 @@ extern void display_cacheinfo(struct cpuinfo_x86 *c);
 extern void generic_identify(struct cpuinfo_x86 * c);
 
 extern void early_intel_workaround(struct cpuinfo_x86 *c);
-extern void intel_cpuid_faulting_flip(unsigned int enable);

diff --git a/xen/arch/x86/cpu/intel.c b/xen/arch/x86/cpu/intel.c
index 3eb06b3d8fcc851b6136d008b3c4d45d0e957903..e5878759cb2f62b9ffe2e4e46673acce4cfec0aa 100644 (file)
--- a/xen/arch/x86/cpu/intel.c
+++ b/xen/arch/x86/cpu/intel.c
@@ -27,7 +27,7 @@ struct movsl_mask movsl_mask __read_mostly;
 
 static unsigned int probe_intel_cpuid_faulting(void)
 {
-       uint32_t x;
+       uint64_t x;
        return !rdmsr_safe(MSR_INTEL_PLATFORM_INFO, x) && (x & (1u<<31));
 }